dgit.raspbian.org Git - qtbase-opensource-src.git/commit

author	Peter Michael Green <plugwash@raspbian.org>
	Sun, 3 Sep 2017 12:56:50 +0000 (12:56 +0000)
committer	Peter Michael Green <plugwash@raspbian.org>
	Sun, 3 Sep 2017 12:56:50 +0000 (12:56 +0000)
commit	4f406fb7400e0cfdf6c88c1fa01534f063a961c0
tree	bc20b3101c7475085b076d74961ca533351edb60	tree \| snapshot
parent	8bf70a2c7dc8c47ee569b1e6cbfc013cb35d1ea1	commit \| diff
parent	802d6f6edac7e3257bac155727bf55623b7cee34	commit \| diff

Manual merge of version 5.7.1+dfsg-4+rpi1 and 5.9.1+dfsg-9 to produce 5.9.1+dfsg-9+rpi1

Unnamed repository; edit this file 'description' to name the repository.